bitkeeper revision 1.1389.19.7 (428332faE9tXKL2EQy-9cj-_mI0V8Q)

Fix blkfront driver for 2.4 domU.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
index 311b8398ed4d606958bb408462279d506176e4b3..f15fcab014183dfd0e565583b10e26b7b4877cdb 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
@@ -824,7 +824,7 @@ static int blkif_queue_request(unsigned long   id,
                         buffer_ma >> PAGE_SHIFT,
                         ( operation == BLKIF_OP_WRITE ? 1 : 0 ) );
 
-            blk_shadow[id].frame[req->nr_segments] =
+            blk_shadow[req->id].frame[req->nr_segments] =
                 buffer_ma >> PAGE_SHIFT;
 
             req->frame_and_sects[req->nr_segments] =